Merge "Revisit fault table"