merged changes from .net client: 362173a..98b5a399