fix #3541: trackable geocode is null
Merge branch 'release' into upstream