I've experimented with the latest ORM master snapshot and it basically looked good. We're not directly affected by the load plan changes as we have a complete separate UniqueEntityLoader implementation, so I think we update to the latest version and do the more involved load plan changes in a separate step. I think it makes sense to wait for the next version supported by WildFly for the sake of integration tests (Beta5 doesn't work to some technical issues).