I have a proposed fix this this, but I'm seeing the same sort of duplicated columns that I saw in HHH-9448 when the same element collection is explicitly referenced in an HQL statement and in an EntityGraph.

I don't think this fix causes this duplication, but I will look into it further.