Ok, I have an alternative implementation. I guess we need a 5.2.1.Final in this case. Jan Martiška, do you guys want/need a 5.1.4 release or is it enough if this makes it into 5.2.1 and then into WildFly 10. Even if we cut a 5.1.4, I am not sure which schedules there are for Wildfly 8 and 9.