Merge "Map removed local overrides to new storage" into main