Merge branch 'experimental' into cookie_daemon