Merge of hopefully non-conflicting changes