Merge "Doc improvements on user guide" into feature/zuulv3