Merge remote-tracking branch 'origin/main' into mbg/improve-json-failures