Fixes CS in latest develop
Merge branch 'cs/#6885-whitespace-in-db-ddl-ast-classes' into develop

Close #6885