[non-BE] BASOP porting of MR 2052 (#1890)

TYAGIRISrequested to merge
1890_basop_mr2052 into main

fix for #1890 (closed)

Merge request reports