Re: Merging robustify patches