Merge betaTest2 into betaTest