closes #1383
Merge pull request #1409 from OCHA-DAP/dan-sprint-34

closes #1383