Fix legacy data source serialization
Merge branch 'subquery' into 0.6.57-n3twork