Teiid 8.5 Alpha1 should be available by the July 4th holiday. Prior to that release and each of the pre-releases I'll merge forward changes from 8.4.x. So far the work remains conflict free and anything that appears too intrusive for 8.4.1 I'm pulling forward to 8.5 so that we can make a better decision if we need to pull it back to 8.4.1. Steve