cpp-common merge commit + equivalent memento change