Merge branch 'jc/run-receive-hook-cleanup'