doc/changelog.asciidoc merge=union