Commits in vsc-v2/vsc-v2:sql-refactor