Merge pull request #5981 from diizzyy/patch-8