Few daemon duplication refactor Upstream-commit: 98a1d9a7128025a2032d557303987a08fc89b17e Component: engine