Merge branch 'synch-main-basop-ci-branch' into 'basop-ci-branch'

[BASOP-CI] (Hopefully last) Synch main -> basop ci branch

See merge request !2411