Contains on Sub query with navigation and projection throws ArgumentException

[mikary]

The following navigation test throws an ArgumentException: Property 'Int32 OrderID' is not defined for type 'Microsoft.Data.Entity.Storage.ValueBuffer'

        [ConditionalFact]
        public virtual void Where_subquery_on_navigation_with_projection()
        {
            using (var context = CreateContext())
            {
                var query = from p in context.Products
                            where p.OrderDetails.Select(od => new NonEntityType
                            {
                                OrderID = od.OrderID,
                                ProductID = od.ProductID,
                                Quantity = od.Quantity
                            }).Contains(new NonEntityType
                            {
                                OrderID = context.OrderDetails.FirstOrDefault().OrderID,
                                ProductID = context.OrderDetails.FirstOrDefault().ProductID,
                                Quantity = context.OrderDetails.FirstOrDefault().Quantity
                            })
                            select p;

                var result = query.ToList();

                Assert.Equal(1, result.Count);
            }
        }

        private class NonEntityType
        {
            public int OrderID { get; set; }
            public int ProductID { get; set; }
            public short Quantity { get; set; }
        }

[anpete]

Another repro:

from o in context.Orders
where (from od in context.OrderDetails
       where (from c in context.Set<Customer>()
              where c.CustomerID == o.CustomerID
              select c).First().Country
             == (from o2 in context.Set<Order>()
                 join c in context.Set<Customer>() on o2.CustomerID equals c.CustomerID
                 where o2.OrderID == od.OrderID
                 select c).First().Country
       select od).Count() > 0
select o;

[mikary]

The first query (Where_subquery_on_navigation_with_projection) is still throwing an ArgumentException but the message is now An item with the same key has already been added.
Exception is thrown from RelationalQueryModelVisitor.RegisterSubQueryVisitor

The additional repro from @anpete does not appear to fail (query compiles and runs but does not terminate in a reasonable amount of time due to the number of store commands).