Merge branch 'main' into double_combo

* main:
  🐛 Create admin set of configured type (#6701)
  Add conditional to `.fileset_for_directives` (#6695)
  ♻️ Extracting naming container (#6694)