Add processing class when initializing file list. Closes #2189.
Merge remote-tracking branch 'upstream/master'