Merge pull request #10338 from hrnr:fix-build