Merge "Attempt to fix deadlock on saveOverrides" into sc-dev