Merge "Add missing word to docs" into feature/zuulv3