Finished testing, back to cm-11.0 branch