Now requires CMSMS 2.1.5+