Merge "Fix error reporting in cp_commitChanges"