Update upstream to 6.0.9

6 jobs for feature/6 in 2 minutes and 46 seconds (queued for 4 seconds)