Merge "Whether to delete snapshot explicitly" into mcp/caracal