Merge "Properly handle unsetting of override" into main