Re: Build regressions/improvements in v4.1-rc5