Update from the cmapi-1.2.0 master repo