merge queue: embarking 0.11.x (cfa749a) and #1989 together #2914

Job	Run time
conformance	1m 58s
build (2_12, test)	12m 48s
build (2_13, test)	12m 25s
build (2_12, mima)	1m 32s
build (2_13, mima)	1m 33s
build (3, mima)	7s
build (2_13, e2e)	4m 19s
build (3, test)	8m 48s
build (3, scala3_compat_test)	8m 29s
build (3, e2e)	4m 28s
build (2_12, examples_and_formatting)	3m 11s
build (2_12, e2e)	3m 28s
build (2_13, scala3_compat_test)	7m 53s
ci-passed	4s
	1h 11m 3s

Provide feedback