Fixed snapshot call.
Merge branch 'test' into dev