Merge branch '28805-download-archive-with-branch-like-feature-xxxx-add-extra-directory-level' into 'master'

Ensure archive download is only one directory deep

Closes #28805

See merge request !9616