Merge branch 'np/delta'