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

Dev dan sprint22
#928