Re: Cherry-pick patch request for 5.15-stable