Merge "Fix the overrides file corruption due to shutdown"