Merge changes from upstream

1 job for test_merge_upstream in 43 seconds (queued for 12 seconds)