Merge master into cpp-common