closes #1478
closes #1495
Merge pull request #1583 from OCHA-DAP/dev-dan-36

Dev dan 36