Issue #22931:account for all control/location combinations