Merge 477:75823cad36b7 with -r 476