Mitigate parallel pull issues Upstream-commit: 1269dd35dcd4c2d28f64c801e5410e172881b9fe Component: engine