snapshot-0 - script update
Merge branch 'snapshot-0' into snapshot-6