Backporting changes from multiple PRs from 3.4-22.04/edge branch #415

Job	Run time
build-rock / lint	4s
build-rock / build	7m 41s
integration (integration, 1.28/stable)	10m 4s
integration (integration, 1.29/stable)	9m 59s
integration (integration, 1.30/beta)	10m 33s
	38m 21s

Provide feedback