Merge "[sf] optimize snapshot updates" into udc-qpr-dev