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