closes #1616
Merge pull request #1677 from OCHA-DAP/dev-dan-38

closes #1616