Merge branch_beta3 onto the mainline.