Merge "Move fault table to the Annex"