A lot of work has been done on this. See https://hibernate.atlassian.net/browse/HHH-13745 for one specific continuation