[finish #74451530]
snapshots
Merge branch 'developer/davidsingal' into develop

* developer/davidsingal:
  snapshots
  [finish #74451530]