Merge "Maps output now marks the fault address location."