Fix table prefix start
Merge branch 'develop'