(cherry picked from commit 94cf07efbf) Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
94cf07efbf