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