closes #1671
missed one
deals with some aspects of #1649 closes #1064
Merge pull request #1767 from OCHA-DAP/marianne-dev

Marianne dev