cmt plugin merge from prototye branch