Support CMSMS 1.12+