Re: 4.0 final, 4.1 merge window, and us