Merge branch 'jk/oi-delta-base'