sync with .net:  cf86a6c