Merge branch 'updates-from-basop-ci-branch' into 'main'

[BASOP-CI] Updates from basop ci branch

See merge request !1593