I didn't want to create separate issue, so committed changes under this one. You can see all the commits related to given JIRA ticket in "Commits" tab above. Review: https://github.com/hibernate/hibernate-orm/commit/bf11088e70319533aa687d066c955c5d1969ac0b. Do you need the fix in branch 4.2.x as well?