Merge pull request #3752 from diizzyy/patch-9