Merge tag 'snapshot-1' into develop

Snapshot 1