TEIID-2603 back-porting 8.5 breaking change