Refactor utils/utils_daemon Upstream-commit: ebd7df3bbeb9486d13119178810a1ddabfd6d04d Component: engine