Fixes https://github.com/scylladb/scylladb/issues/26688
V2 of https://github.com/scylladb/scylladb/pull/26687
Closes scylladb/scylladb#26689
(cherry picked from commit bd5b966208)
Closes scylladb/scylladb#26751
Fixes https://github.com/scylladb/scylladb/issues/26688
V2 of https://github.com/scylladb/scylladb/pull/26687
Closes scylladb/scylladb#26689
(cherry picked from commit bd5b966208)
Closes scylladb/scylladb#26751