Merge pull request #4418 from diizzyy/patch-52