Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
(cherry picked from commit b077850baa)
b077850baa