sync to 1b0f264
fixed issues with .net version