Merge of #1989 #2912

Job	Run time
conformance	2m 2s
build (2_12, e2e)	3m 38s
build (2_12, mima)	1m 33s
build (2_12, test)	14m 27s
build (3, test)	10m 6s
build (2_13, test)	10m 58s
build (3, scala3_compat_test)	9m 27s
build (2_12, examples_and_formatting)	3m 17s
build (2_13, e2e)	4m 24s
build (2_13, mima)	1m 34s
build (3, mima)	8s
build (2_13, scala3_compat_test)	9m 44s
build (3, e2e)	4m 26s
ci-passed	3s
	1h 15m 47s

Provide feedback