Merge branch 'updateSnapshot'