Merge branch '1891_basop_mr2048' into 'main'

[non-BE] basop porting of mr 2048, basop branch

See merge request !2040