Merge change 21051 into donut

* changes:
  Add support for the new qualifier in the config selector.