Merge "Revert "Add missing card mark verification to CC""