Export of locations that are not stored in an entity
Merge origin/master