Merge "Updating the user guide"