(cherry picked from commit 3d19e15a7d) Co-authored-by: Mikhail Khvoinitsky <m-khvoinitsky@users.noreply.github.com>
3d19e15a7d