continue daemon refactor of Repositories() Upstream-commit: 7787d6dc2882def6bc125395c924827d30bd8a03 Component: engine