TEIID-2633 ensuring that we don't changing the optional property