Branch merge of change-tagging branch with trunk