Autoslave code merge

Final autoslave code merge.