Merge pull request #7690 from Srokap/master

Merge branch '1.x' into master