Don't set$Data for key columns, don't generate columns in DDL for arrays / lists
Merge remote-tracking branch 'refs/remotes/upstream/master'