From FIXME: local path for ADD Upstream-commit: 58281b4f18b01b06f49e9ca90e39c918bfc3275b Component: engine