#886645 want guidance for changelogs when history is merge-ish