Merge branch 'dev' into 'main'

* merge dev with latest fixes

See merge request !3
6 jobs for main
in 1 minute and 21 seconds, using 0 compute credits, and was queued for 1 second