Freeman Fang, can you review https://github.com/hibernate/hibernate-orm/pull/620? Missing anything else?