Update to OT, CM and the CM update script.

@jankeromnes, merge this first.