Java client backport old issues 7.17 (#2444)

* backport of #2151 (issue 238)

* backport of #2039 (issue 296, 347)

* backport of #2232 (issue 418)

Author: l-trotta