closes #1804
Merge pull request #1813 from OCHA-DAP/dev-dan-40

closes #1804