#854 , #802
Merge pull request #897 from OCHA-DAP/dev-dan-sprint22

#854 , #802