Merge branch 'own_location'