Merge branch 'jc/apply'