Merge Beta to Master - Prepare for 1.2.9