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