Adding the location field
Merge branch 'develop'