Merge pull request #8611 from diizzyy/gh-issues