Merge branch 'np/types' into jc/fetch