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