Re: Add commit 716c7c32eae4 to 4.16 stable