changes to the daemon
merged
merge