Merge "Remove file extension when building SimpleLayout" into feature/zuulv3