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