Fix tests
Merge branch 'broadcast-location-attributes' into stage