Gary LosHuertos, I realize this is old (apologies for the delay), but any chance you'd be able to include a unit/regression test in your PR? Verify this is still an issue in ORM 5?