Move the accounting phase of the DL pre-processor in a separate procedure and fix some issues

nikaeinnrequested to merge
enhancement-preprocessor into develop

Merge request reports