Merge branch 'release/BETA3'