Merge "Sort output in generated legacy files" into feature/zuulv3