Merge branch 'cc/apply' into maint