Respect auto-save and auto-sync settings.
Merge remote-tracking branch 'origin/master'
add model change support & some formatting