Merge pull request #4854 from diizzyy/patch-91