Fix wrong untag using id rmi Upstream-commit: c06aa62bdaa92df5c58d0ca5deb54b1ca66f3ba5 Component: engine