merge
fix version diff
work in progress
make sure relation field are not in scope
Merge remote-tracking branch 'upstream/master'
merged
cleanup tests for sql branch