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