Merge "Add a switch for update ownership enforcement"