Merge pull request #4600 from diizzyy/patch-74