Merge branch 'jc/maint-apply-fix'