Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit 14c8b67e51a8340284dfd8919843ce9edd1e5c71) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9c93de59da8eaa0e0e0377578a33b465b9465bb2 Component: engine
Signed-off-by: Deep Debroy <ddebroy@docker.com> (cherry picked from commit 7d1c1a411b5c5bd58e657b24261f32d04fa0d8c5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9fc9c3099da40b21fed9adc758f8787dbd3cedfd Component: engine