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