Merge pull request #3923 from diizzyy/patch-29