Merge branches 'master' and 'preproc-paste-fix'