merge h2o64/cm-12.0