Following on from issue https://hibernate.atlassian.net/browse/HHH-16858and others, I’ve worked on laying down a well-defined set of rules that are both stricter in some ways, and more forgiving in others.