closes #883 and closes #834
Merge pull request #920 from OCHA-DAP/marianne-dev

closes #883 and closes #834