Merge branch 'np/types'