Done (#3220)
Please wait for a windows tests before merging.