Merge branch 'jc/nodelta'