Merge pull request #5225 from diizzyy/patch-110