Merge "Update user-guide."