Re: 2.4 commit review