Merge "Use 'delete_snapshot' method"