merge java c3ae223a43bcb7c60a0d7a8159759c2194a1e376

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