Include CMS private patch uploaded to cms-externals.

See also #928.