Backport https://github.com/redpanda-data/redpanda/issues/30398 to branch v25.3.x. Requested by PR https://github.com/redpanda-data/redpanda/pull/30525
Backport #30398 to branch v25.3.x. Requested by PR #30525