Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev