Merge pull request #4673 from diizzyy/patch-79