commit local
Merge remote-tracking branch 'origin/1.2.x' into 1.2.x