fix CRs for conf6