[Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" See merge request !1251
mentioned in issue #924