Merge branch 'eb/apply' into next