Merge "Fix out-of-order transactions (2/2)" into oc-dr1-dev