Merge "Addresses unresolved comments for silent updates" into sc-dev