Merge 1.2.17 to 1.3.x