Merge branch '855-cr_fix_jbm_flush_offset-switch-leftovers' into 'main'
[Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" See merge request !1251
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
[Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" See merge request !1251