Synced to WIN development version.