Merge branch 'cookie_daemon' into experimental