hook 2476026f77 into 4.18