#702
Merge pull request #710 from OCHA-DAP/dev-dan-fixes

#702 closed