Container name lookups to prefer IDs over names Upstream-commit: 140e6abb17a85a569416236352a4fb07ce508480 Component: engine