Merge pull request #8957 from slavapestov/fix-the-build-mostly

Fix the build mostly