cleanup
reboot build system
Merge remote-tracking branch 'origin/1.2' into 1.2