Backport changelog entry