Merge branch 'dev' into 'main'

+ fixes for prepare and CI scripts

See merge request !4
6 jobs for main
in 1 minute and 29 seconds, using 0 compute credits, and was queued for 2 seconds