merge beta3 code