merge queue: embarking master (0aba685) and #1975 together #2878

Job	Run time
conformance	2m 5s
build (2_13, e2e)	4m 18s
build (2_13, test)	10m 22s
build (3, e2e)	4m 40s
build (3, test)	11m 2s
build (2_12, examples_and_formatting)	3m 7s
build (2_12, e2e)	3m 39s
build (2_12, test)	12m 13s
build (2_13, scala3_compat_test)	7m 37s
build (3, scala3_compat_test)	9m 18s
ci-passed	4s
	1h 8m 25s

Provide feedback