Merge "Remove comments questioning API capabilities" into feature/zuulv3