I re-opened your PR Dmitry Panov in case you want to push the change I suggested to your branch. We can then retest it against the Hibernate portfolio and verify no other issues arise.