Merge pull request #4885 from diizzyy/patch-92