Merge branch 'reports-angular-perf-fixes' into 'master'

Performance fixes

Closes #488

See merge request !234
1 job for v1.3.1rc2 in 2 seconds (queued for 3 seconds)
latest