Merge changes from topic "embargo-variants" into main

* changes:
  Merge values from legacy config into variants too.
  Expand values from top level config into variants when parsing.
  Support variants.