Added autosave
Merge branch 'development' into OG_upgrade