Merge branch 'jw/make-arflags-customizable' into maint