Merge branch 'preproc' into maint