Merge "[sf] Properly update clones of clones" into udc-dev