Merge "Handle multiple users when adding and rechecking overrides." into sc-dev