merge queue: embarking master (84e18f3) and #1972 together #2870

Job	Run time
build (2_13, test)	12m 25s
build (2_12, examples_and_formatting)	3m 27s
conformance	3m 56s
build (2_12, e2e)	3m 58s
build (2_12, test)	11m 11s
build (2_13, e2e)	4m 6s
build (3, e2e)	4m 49s
build (2_13, scala3_compat_test)	8m 31s
build (3, test)	10m 3s
build (3, scala3_compat_test)	8m 17s
ci-passed	4s
	1h 10m 47s

Provide feedback