stash commit
client not yet race free, but sleep helps
location display works!
Merge remote-tracking branch 'origin/ticket-#12'