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