Merge "Thread-consistent snapshots" into sc-dev