Update CMFDiffTool branch.