Performance and structural optimizations

Closed Marius Kriegerowski requested to merge dev into master

Merge request reports