Bulk update from the cmapi repo v1.3.0 branch