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