Pull request for merging dev into staging ( map update and more logs ) - sprint 40