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