closes #1784
Merge pull request #1886 from OCHA-DAP/dev-dan-42

closes #1784