Merge 1.2.7 to 1.3.x