merge upstream version to the branch hermit

1 job for master in 52 minutes and 45 seconds (queued for 2 seconds)