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