[Finish #10717] Friday commit with no comment added