Merge remote-tracking branch 'github/main' into open-source-h