Merge branch 'dev' into 'main'

Fixes for manifests

See merge request !6
6 jobs for main
in 2 minutes and 10 seconds, using 0 compute credits, and was queued for 3 seconds
latest