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