Merge pull request #5209 from hvr/pr/issue-5201