Merge pull request #493 from aytey/fix_cms_xors

Bump CMS to 5.11.22