Merge pull request #7542 from Rixerx/master