Fix donors map
Merge branch 'dev' into staging