updates to do release
Merge branch 'windows-port2' into windows_port
updates from windows/linux reconciliation