Merge "Add user guide" into stable-2.11