Merge branch 'release/beta-10' into develop