closes #1785
Merge pull request #1832 from OCHA-DAP/dev-dan-40

closes #1785