Ticket/20388/add windows defaults