merge japaric 5a0aca700b613d185efc77ede32f37aff7761ca2

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