Merge 1.2.9 down to 1.2.8