Merge "Improved user guide details"