Merge branch 'main' into chore/ess-next #13400

Job	Run time
e2e-node (ubuntu-latest, 20.x, ESS PodSpaces, false)	1m 16s
e2e-node (ubuntu-latest, 20.x, ESS Next, false)	57s
e2e-node (ubuntu-latest, 20.x, ESS Release-2-3, false)	50s
e2e-node (ubuntu-latest, 22.x, ESS Release-2-3, false)	48s
e2e-node (ubuntu-latest, 22.x, ESS PodSpaces, false)	1m 1s
e2e-node (ubuntu-latest, 22.x, ESS Next, false)	58s
check	2s
	5m 52s

Provide feedback