Bugfix: Remove links when remove container Upstream-commit: b6498340b2baa6596553b2b56b43990a365a7b6a Component: engine