Merge branch 'hotfix/device_location_map'

Status Job ID Name Coverage
  Test
canceled #492
unit_test

 
  Deploy
canceled #493
deploy_staging