Merge pull request #4219 from diizzyy/patch-43