Move links functionality into pkg Upstream-commit: e9db157bee3719e9c23779446dd23f84a870c92b Component: engine