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