Changelog/doc edits following PR #2684