Pull in changes to SystemDaemon