closes #1578
Merge pull request #1621 from OCHA-DAP/dev-dan-37

closes #1578