Merge branch 'location'