Follow up to HHH-16. The initial work for HHH-16 does allow for entity-joins to be specified in a query. However, defining a query that combines entity-joins and implicit joins leads to the generation of SQL that databases will have varying support for.