Merge branch '1911_basop_mr2196' into 'main'

[non-BE][split-non-be][allow-regression] basop porting for mr2196

See merge request !2075