extend-opt-in-switch
Merge pull request #4491 from guardian/extend-opt-in-switch

Switch: extend opt-in-switch