Monster merge of changes.