Merge branch '1806_basop_ht_osba' into 'main-pc'

[split-non-be][non-BE] basop porting, fix for issue 1806

See merge request !1872