sync with .net: 00941d79dca43bbdd095bc1d09e000acd7004f91