[DebugBundle] adjust after review