[Finish #10810] Friday commit