#703
Merge pull request #711 from OCHA-DAP/dev-dan-fixes

#703