closes #1185
Merge pull request #1191 from OCHA-DAP/dev-29-dan

closes #1185