CHANGELOG merge=union
CHANGELOG-EE merge=union