merge java a9840c0935243cc1c3e93e45f72bef70ea330f63

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>