[11.x] Fix casts + withAttributes
#54422
+126
−2
Merged
Loading