The merged fix also fixes HHH-8916 Awaiting Response in my opinion. At least addTopExpression previously was brittle enough to attach TOP to the wrong select, if you were using a distinct subquery with an non-distinct outer query. E.g. "select someEntity.someKey, (select distinct anotherEntity.value from AnotherEntity anotherEntity where anotherEntity.id in (1337, 42)) from SomeEntity someEntity". Anyway - thanks for this fix!