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 Saturday, 27 September 2025, from 07:00 AM to 4:00 PM GMT (09:00 AM to 6:00 PM CEST)
[Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" See merge request !1251