Re: merge for universal builds