Merge pull request #10320 from mshabunin:static-analysis-1