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