Reports now honour findFunc
Merge branch 'reports' into dev
Merge remote-tracking branch 'origin/dev' into dev