Adam Warski or Lukasz Antoniak, I added a pull request: https://github.com/hibernate/hibernate-orm/pull/726 .

Could one of you please take a look at the proposed fix?

Thanks,
Gail