Merge branch 'cc/delta-islands'