Fix donors query
Merge branch 'dev' into staging
Remove debugger
Merge branch 'dev' into staging