Signed-off-by: Boris Karasev <karasev.b@gmail.com> (cherry picked from commit beb0697f24c5edab4345632944db466ac4daef38)