#1209
#1186
Merge pull request #1221 from OCHA-DAP/bug-fixes

PUll request for: #1209 #1186