last snapshot [mark]
Merge branch 'mark' into alex