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