Merge pull request #4962 from diizzyy/patch-96