Add prefix support for table names to DB
Merge remote-tracking branch 'origin/master'