Fixups for #47383 (fixes runbenchmarks("sort")
)
#47822
Merged
runbenchmarks("sort")
)
#47822