Merge "Remove unnecessary loop in github test" into feature/zuulv3