#707
Merge pull request #709 from OCHA-DAP/dev-dan-fixes

#707