More cleanup on fascinatemtd tree by merging changes from cm/cm-10.1 branch.