closes #2035
Merge pull request #2036 from OCHA-DAP/dev-dan-45-2035

closes #2035