Merge "Patch crrev/c/5450018 and crrev/c/5458753" into main