+++ This bug was initially created as a clone of Bug #1085953 +++ This is an one-off patch for bug 1048709. The details could also found in https://hibernate.atlassian.net/browse/HHH-3051.
The patch is completed on 1085953
verified on EAP 6.2.3.CP.CR2