Merge pull request #3919 from AndrzejKurek/fi-flag-ccm-countermeasures

Make CCM shuffling an masking optional