Merge branch 'dev'
Merge branch 'dev'
refactoring schema for meaningful names

- Row_Type_TC = 'TC'
- Row_Type_TS = 'TS'
Merge branch 'master' into dev