Re: Request to backport 2618a0dae and ca831f29f8f2 to stable tree