Merge "Add clear_overrides unit test" into main