Merge "Fix broken references in documents"