Merge Daemon improvements to master