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