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