Merged with https://github.com/seemethere/unir Upstream-commit: d7f8fe075d4bd078afbd71e5d29c2f2a3dae4ce7 Component: packaging