Hibernate brakes correct collection batch fetching in 2 ways.

I set global hibernate.default_batch_fetch_size=16.

1. When I try to initialize a lazy collection and there are other 5 similar uninitialized collections I expect that hibernate will initialize all of them in one single query, something like
   select ... from ... where id in(?,?,?,?,?,?)
   But hibernate 6.x generates a lot of similar queries. All theese queries contain overlapping ids.
2. When I try to initialize a single lazy collection I expect that hibernate will initialize it with single bind parameter.
   But hibernate 6.x initialize it with in cluase with 16 binding parameters.

I researched first issue and I think that the cause is incorrect empty persistence collection handling.

If some parent entity doesn’t contain children entities BatchFetchQueue is incorrectly cleared.

I think after CollectionLoaderBatchKey::batchLoad hibernate should delete all batchIds from BatchFetchQueue but in reality it deletes only one of them.

This leads to fact that hibernate try to load same collections againg and againg.