Merge "Added visibility needed for the S snapshot"