Merging in latest upstreams