fixes of autosave
Merge remote-tracking branch 'origin/origin' into origin