Merge of #1989 #2913

Job	Run time
conformance	2m 4s
build (2_12, mima)	1m 29s
build (2_13, mima)	1m 35s
build (2_12, test)	15m 45s
build (3, mima)	18s
build (2_12, e2e)	3m 39s
build (2_13, e2e)	4m 15s
build (3, e2e)	4m 29s
build (2_12, examples_and_formatting)	3m 15s
build (3, test)	10m 41s
build (2_13, test)	10m 42s
build (2_13, scala3_compat_test)	6m 58s
build (3, scala3_compat_test)	10m 13s
ci-passed	2s
	1h 15m 25s

Provide feedback