Merge of #1929 #2785

Job	Run time
conformance	4m 10s
build (2_12, mima)	1m 21s
build (2_12, test)	12m 14s
build (2_13, test)	9m 29s
build (2_12, e2e)	3m 48s
build (3, mima)	10s
build (2_13, e2e)	3m 54s
build (3, e2e)	4m 26s
build (3, test)	10m 42s
build (2_13, mima)	1m 28s
build (3, scala3_compat_test)	7m 26s
build (2_13, scala3_compat_test)	8m 35s
build (2_12, examples_and_formatting)	2m 54s
ci-passed	2s
	1h 10m 39s

Provide feedback