Closes scylladb/scylladb#23686 (cherry picked from commit cf11d5eb69) Closes scylladb/scylladb#23710
cf11d5eb69