Merge "Remove layout option, adapt -t option accordingly" into feature/zuulv3