Patch from #2723259-23 (rules-single-value-selector-to-array-2723259-23.patch) turned into a merge request and rebased against 4.0.x
Closes #2723259