Merge "Ensure compatible layout for vertices"