eclass changes for CM changes