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

[CI][BASOP-CI] Move basop-CI-related changes to main

See merge request !2421