Merge pull request #4978 from diizzyy/patch-99