(cherry picked from commit 3f197f94d6) Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
3f197f94d6
(cherry picked from commit e5f41d2f1e) Co-authored-by: Steve Dower <steve.dower@microsoft.com>
e5f41d2f1e