Merge branch 'np/delta' into next