Added missing files
Merge remote-tracking branch 'origin/enhance_map_api' into next

* origin/enhance_map_api:
  Added missing files