DPC-191 - pre-processing for errors
Merge branch 'next'