Merge "docs: Add cross references in userguide" into integration