Merge branch 'new-preproc'