Fix patch for PR1430

3 jobs for 1.17 in 3 minutes and 17 seconds (queued for 1 second)