Updates from the cmapi 1.3.0 repo