Merge pull request #921 from OCHA-DAP/dev-dan-sprint22

Dev dan sprint22
#916