add context manager for daemon
Merge branch '5027-people'