Merge pull request #9409 from afedchin/winrendererj