Merges upstream development