Supporting Corral's error trace generation input format.
Merge branch 'corral-error-trace' into develop