Add snapshot name to statistics
Merge tag 'upstream/0.0.16'
Add snapshot name to statistics.