Re: commit review for 2.4.39