Merge "Fix doc typo" into feature/zuulv3