Merge pull request #6899 from diizzyy/patch-12