Merge pull request #3857 from diizzyy/patch-28