* Build: Stabilize ADD behavior Upstream-commit: a660cc0d012f54bbacb9f7364092a7223d0c1418 Component: engine