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