Merge remote-tracking branch 'upstream/main' into rhoai-3.4

Merge remote-tracking branch 'upstream/main' into rhoai-3.4 #1979