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