Merge of #1976 #2881

Job	Run time
conformance	4m 13s
build (2_12, mima)	1m 21s
build (2_12, e2e)	3m 25s
build (2_12, test)	12m 36s
build (2_12, examples_and_formatting)	2m 47s
build (2_13, mima)	1m 22s
build (2_13, test)	11m 43s
build (3, e2e)	4m 20s
build (2_13, scala3_compat_test)	8m 47s
build (2_13, e2e)	4m 6s
build (3, mima)	10s
build (3, test)	11m 20s
build (3, scala3_compat_test)	6m 49s
ci-passed	2s
	1h 13m 1s

Provide feedback