Merge of updates from upstream