Backport https://github.com/redpanda-data/redpanda/issues/30374 to branch v25.2.x. Requested by PR https://github.com/redpanda-data/redpanda/pull/30400
Backport #30374 to branch v25.2.x. Requested by PR #30400