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