Merge remote-tracking branch 'origin/main' into rebornix/minimum-newt