Code

Merge branch 'jc/fetch-verify'