Integrate autosave_local into core (#118)