closes #1439
Merge pull request #1464 from OCHA-DAP/dan-sprint-35

closes #1439