patched merge request MR1251 [Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" into ref. See merge request !956