Performance improvements?

Merged Michael Sammler requested to merge ci/subst_performance into master

Merge request reports