[11.x] Use Str::wrap() instead of nesting Str::start() inside Str::finish()#53987