Merge "[sf] avoid traversals for cursor updates and buffer udpates" into udc-dev