Issue #18758: Fixed and improved cross-references.
40 files changed