[fix-fault-parsing] Ensure that faults are parsed correctly.
Merge branch 'fix-fault-parsing'