Merge pull request #4306 from BrzVlad/fix-roslyn-ppc