Complex patch for ORM infrastructure
Complex patch for ORM infrastructure