(cherry picked from commit 703985dc709afad2df0ff69d929751894da51b34) Co-authored-by: Andrey Gusakov <dron0gus@gmail.com>