Merged with master and completed support for partial orders.