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

[BASOP-CI] update basop-ci-branch with main

See merge request !1592