New3

Merged changes introduced to .net client