Sync binary commits with vndr Upstream-commit: 302e584b78db16ea39aca7d7c1612370c50d20f5 Component: engine