Merge of #1877 #2582

Job	Run time
conformance	6m 44s
build (2_12, mima)	1m 47s
build (2_12, examples_and_formatting)	3m 14s
build (3, mima)	7s
build (2_12, e2e)	3m 44s
build (2_13, test)	12m 35s
build (2_12, test)	11m 38s
build (2_13, mima)	1m 23s
build (2_13, e2e)	4m 7s
build (3, e2e)	4m 21s
build (3, test)	10m 13s
build (3, scala3_compat_test)	7m 55s
build (2_13, scala3_compat_test)	8m 8s
ci-passed	2s
	1h 15m 58s

Provide feedback