use CMFDiffTool branch