Merge "Improve snapshot clearing consistency" into sc-dev