Merge pull request #5917 from diizzyy/patch-2