Merge branch 'jc/maint-apply-fix' into maint