Made order data accessible in child objects
Merge from master