This merge brought quite a few conflicts because of recent changes in trunk to SFTs and other middle-end changes. Bootstrapped and tested x86_64. Diego.