Merge pull request #7786 from diizzyy/patch-1