Re: duplicated patch in 5.4