Merge branch 'ag/maint-apply-too-large-p'