Merge "[sf] protect against out of order transactions" into udc-dev