Merge branch 'vendor' into main

3 jobs for main in 5 minutes and 29 seconds (queued for 1 second)