Remaining changes after Merge