(cherry picked from commit 881323db71) Co-authored-by: Steve Dower <steve.dower@microsoft.com>
881323db71