#696
Merge pull request #706 from OCHA-DAP/dev-dan-fixes

#696 closing