CHANGELOG merge=union

