Note: in VVC draft 6 "–	If intra_bdpcm_flag[ ][ ] is equal to 1, ctxInc is set equal to 1.", which was set equal to 4 in VTM5. This integration also implements this change, to align cbf ctx with VVC draft 6.