merge nakamuray 54edb0f25b0862351493a38eba45caecbc556dd2

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