Merge pull request #4430 from diizzyy/patch-58