Re: [f18-branch] v2 patches