Merge branch 'jc/receive-verify'