change code in container restore Upstream-commit: a6688959b4d574994f29af43d263caa83ee89ed2 Component: engine