Merge branch 'performance-tune' into 'pa2'

Performance tune

See merge request !2
3 jobs for pa2
in 10 minutes and 47 seconds and was queued for 2 seconds