Merge branch 'ap/maint-apply-modefix' into maint