Re: Apply c95bbb59a9b2 to 6.12.y