Merge pull request #9963 from mexon/mat/support-cid-scheme