Merge of #1923 #2789

Job	Run time
conformance	1m 34s
build (2_13, e2e)	3m 54s
build (2_13, test)	13m 45s
build (3, e2e)	4m 13s
build (2_13, mima)	1m 20s
build (2_12, mima)	1m 10s
build (3, mima)	8s
build (2_12, examples_and_formatting)	2m 41s
build (3, scala3_compat_test)	8m 24s
build (2_12, test)	12m 19s
build (3, test)	11m 57s
build (2_12, e2e)	3m 5s
build (2_13, scala3_compat_test)	9m 38s
ci-passed	3s
	1h 14m 11s

Provide feedback