Joins should support additional restrictions (HQL-with)

Following query shoul use 'AND' in ON join expression

var result =
(from o in session.Query<Order>()
from ol in o.OrderLines.Where(x => x.Name.StartsWith("Order Line 3")).DefaultIfEmpty()
select new {OrderId = o.Id, OrderLineId = (Guid?) ol.Id}).ToList();

Expected SQL:

select
order0_.Id as col_0_0_,
orderlines1_.Id as col_1_0_
from
Orders order0_
left outer join
OrderLines orderlines1_
on order0_.Id=orderlines1_.OrderId
and orderlines1_.Name like ('Order Line 3')

And with IEnumerable projection:

var orders = db.Orders
.Select(o => new
{
o.OrderId,
OrderLinesIds = o.OrderLines
.Where(ol => ol.Discount > 1)
.Select(ol => ol.Id)
.ToArray()
})
.ToList();