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