Merge pull request #4852 from diizzyy/patch-90