fix to this ticket. re #9406
Update unit test to ex with spaces. re #9406
Merge remote-tracking branch 'origin/feature/9406_locations_spaces'