Merge "Cleanup mesh creation."