fix to this ticket. re #9406
Merge branch 'feature/9406_locations_spaces' into develop