Merge branch 'new-osba-baseline' into 'main'

[ref-using-main] New osba baseline

See merge request !811