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