Merge r205155 from head: Add extra Xrefs PR: docs/114184 Submitted by: Julian Stacey <jhs berklix.org>