(cherry picked from commit 5c9241fa7c) Co-authored-by: Zim Kalinowski <zikalino@microsoft.com>
5c9241fa7c