Merge pull request #4867 from vkeranov/3.1-stable

[ci skip] Fix a changelog entry