Merge pull request #9806 from mshabunin:fix-static-7