Merge branch 'jc/apply' into next