Pass base URI to V1 data store only in true single org mode
Handle exceptional conditions where stops are being called all over
Merge branch 'base_uri'