Merge pull request #4887 from diizzyy/patch-94