Re #10566. Adding implementation for windows and mac.