Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> (cherry picked from commit ab797325c6)
ab797325c6