Follow up to fix preconditions for columns that make orders.encounter and order.orderer required - TRUNK-4282