Merge beta to master for 1.2.6