closes #1894
Merge pull request #1984 from OCHA-DAP/dev-dan-44

closes #1894