closes #1478, #1523
Merge pull request #1536 from OCHA-DAP/dev-dan-1523

closes #1478, #1523
Merge pull request #1537 from OCHA-DAP/dev

Merge DEV into STAG