daemon: do not use pointers to map Upstream-commit: 2945f902bdd090811d840c288bbe7e7072804ea6 Component: engine