from_clause is option
Merge remote-tracking branch 'origin/cc' into cc