Closes scylladb/scylladb#24096 (cherry picked from commit bf9534e2b5) Closes scylladb/scylladb#24257
bf9534e2b5