Escape table name in relational schema editing
Merge branch 'QA_3_5'
Fix merge conflicts