Merge from upstream

1 job for test_merge_upstream in 1 minute and 52 seconds (queued for 2 seconds)