Merge branch 'jc/daemon-access-hook'