Finishing Merge of upstream