Code changes for Snapshot 6