Merge pull request #3732 from diizzyy/patch-3