Bulk update from the CMAPI repo v1.3.0 branch