Merge pull request #8696 from demopark/master