Backport 2901

Backports #2901.

@charris, would you mind reviewing the release notes change please?