merge queue: embarking 0.11.x (5b8f0a9), #1953 and #1952 together #2829

Job	Run time
conformance	1m 51s
build (2_12, mima)	1m 23s
build (2_13, mima)	1m 23s
build (2_12, e2e)	3m 26s
build (3, mima)	7s
build (2_12, test)	12m 29s
build (3, e2e)	4m 38s
build (3, test)	8m 50s
build (2_13, e2e)	4m 1s
build (2_13, test)	13m 47s
build (2_12, examples_and_formatting)	2m 58s
build (2_13, scala3_compat_test)	7m 0s
build (3, scala3_compat_test)	7m 42s
ci-passed	3s
	1h 9m 38s

Provide feedback