Merge "Preserve options on remount in commitChanges"