#657
Merge pull request #676 from OCHA-DAP/dev-dan-fixes

#657