closes #1988
Merge pull request #2034 from OCHA-DAP/dev-dan-45

closes #1988