Merge "[sf] fix overflow in snapshot generator" into udc-qpr-dev