Adapt CMS private patch to 4.10.00p3.