Merge pull request #1275 from OCHA-DAP/dev-dan-32

closes #1264
#1144
#1144