Merge pull request #4416 from diizzyy/patch-50