Backport https://github.com/redpanda-data/redpanda/issues/21552 to branch v26.2.x. Requested by PR https://github.com/redpanda-data/redpanda/pull/30956
Backport #21552 to branch v26.2.x. Requested by PR #30956