Generate Dynamic VDB: Columns with non-standard characters end up in the resulting xml without quotes, resulting in a an undeployable vdb

The Teiid vdb has column named e.g. PE$HOME. When I generate a dynamic vdb xml from this model, the xml document contains:
CREATE FOREIGN TABLE MYTABLE (
ID string(40) NOT NULL,
NAME string(40),
PE$HOME string(19) NOT NULL,
CONSTRAINT FKI_MY_VIEW PRIMARY KEY(ID)
)
When i deploy this, it fails because P$HOME is not allowed as column name.
I expect to see this name "quoted" in the xml vdb:

CREATE FOREIGN TABLE MYTABLE (
"ID" string(40) NOT NULL,
"NAME" string(40),
"PE$HOME" string(19) NOT NULL,
CONSTRAINT FKI_MY_VIEW PRIMARY KEY(ID)
)
Proposed solution: always use "quotes" in source and view xml vdb, both for the column names, and the mapping statement.