#720
Merge pull request #722 from OCHA-DAP/dev-dan-fixes

#720