Merge pull request #7775 from diizzyy/patch-22