(cherry picked from commit 755b7c7aee) Co-authored-by: hrls <viktor.kharitonovich@gmail.com>
755b7c7aee