Made ready for CMSMS version 1.9 an onwards. Solved bugs 2690, 4092 and 6469.