std: Second pass stabilization for boxed
#20420
+29
−3
Merged
boxed
#20420