Merge branch 'add_missing_instrumentation_for_881_bug_fix' into 'main'

Added missing instrumentation for MR !789 and bug fix in swb_tbe

See merge request !1082