Merge early parts of 'np/delta' branch