Transactionality of saving changes.
Merge branch 'usage_dev_branch' of https://github.com/open-infinity/cmt into usage_dev_branch