Merge pull request #4665 from Li4ick/patch-1