Merge pull request #5248 from diizzyy/patch-111