merge queue: embarking 0.11.x (7125735) and #1976 together #2883

Job	Run time
conformance	2m 2s
build (2_12, test)	11m 40s
build (2_12, mima)	1m 31s
build (3, mima)	9s
build (2_13, e2e)	4m 9s
build (2_13, mima)	1m 16s
build (3, e2e)	4m 29s
build (2_12, examples_and_formatting)	2m 38s
build (3, test)	9m 44s
build (2_12, e2e)	3m 15s
build (2_13, test)	8m 58s
build (2_13, scala3_compat_test)	9m 10s
build (3, scala3_compat_test)	7m 25s
ci-passed	2s
	1h 6m 28s

Provide feedback