closes #1513
Merge pull request #1514 from OCHA-DAP/dev-dan-36

closes #1513
Merge pull request #1515 from OCHA-DAP/dev

Merge DEV into STAG