Merge branch 'jc/delta' into next