Merge branch 'main-pc' into 1172_basop_CR_FIX_JBM_FLUSH_OFFSET_switches