Merge branch 'basop_instrumentation_updates_mr889' into 'main'

Added missed instrumentation, basop changes for MR 889

See merge request !1035