Issue #22931:account for all control/location combinations
Merge pull request #135 from garyhgohoos/22931

Issue #22931:account for all control/location combinations