Merge branch 'dev' into 'main'

-remove redudancy

See merge request !1
6 jobs for main
in 1 minute and 59 seconds, using 0.0 compute credits, and was queued for 15 seconds