Combining !include and !include_dir_named with packages

I have packages in (unrelated) individual YAML files, but I also have related YAML files in a directory that I want to include together.

I know I can change this:

homeassistant:
  packages:
    one: !include my_packs/one.yaml
    two: !include my_packs/two.yaml
    three: !include my_packs/three.yaml

to this:

homeassistant:
  packages: !include_dir_named my_packs/

But, is there a way to combine a directory and individual YAML files?

I tried things like this:

homeassistant:
  packages:
    !include_dir_named my_packs/
    other: !include packages/other.yaml

or using labels:

homeassistant:
  packages my_packs: !include_dir_named my_packs/
  packages other:
    other: !include packages/other.yaml

Use !include_dir_named packages, where you can have additional folders with individual files.

homeassistant:
  packages: !include_dir_named packages

Yes, that’s probably the way to go.

I’ve been using a bunch of !include lines when testing so that I can easily comment them out in configuration.yaml. Probably just as easy to move the YAML files out of the packages directly.