Better solution for empty locations.
Merge branch 'release/0.9.2'