[CI][BASOP-CI] synch main and basop-ci-branch
Add some changes done on basop-ci-branch only to main to keep scripts and CI code in synch as much as possible.
Add some changes done on basop-ci-branch only to main to keep scripts and CI code in synch as much as possible.