Merge "Non-functional refactor of Location Extras"