Performance improvements

Laurent requested to merge performance_improvements into master

Merge request reports