Add changelog entry and a test case for #4758
2 files changed