fix order of DDL statements
remove file
Merge branch 'master' into release