Merge "Optimization for slow UML element creation"