merge japaric 1d15e16a362cebb06b855e16faa06cc90f65d743

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