Merge "Improve References to User Guides"