[5.x] Harden DataCollection sort value resolution
#14693
+69
−10
Merged