Merge branch 'issues/122' into 'master'

Increase reflector speed

Closes #122

See merge request !148
5 jobs for master in 35 minutes and 16 seconds (queued for 3 seconds)