Merge branch 'np/push-delta'