Merge remote-tracking branch 'github/master' (contains some snapshots operations)
add rollback-snapshot
Merge rollback-snapshot