Merge branch 'float-pc' into 1172_ref_CR_FIX_JBM_FLUSH_OFFSET_switches