fix for mock data and database schema name
Merge remote-tracking branch 'origin/snapshot' into snapshot
fix for mock data and database schema name