Merge pull request #8718 from demopark/master