Add location table if not exist
Merge branch 'master' into toronto