Merge pull request #4677 from diizzyy/patch-82