Fill error report
Undo hacking
Merge remote-tracking branch 'upstream/mtecs_estimator' into navigator_rewrite_estimator