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

[CI][BASOP-CI] synch main and basop-ci-branch

See merge request !2096