Dev but fix main merge conflicts #6424

Job	Run time
run_rubocop	26s
unit_tests (2.4.10)	5m 53s
unit_tests (3.4.1)	5m 4s
multiverse (agent, 2.4.10)	2m 21s
infinite_tracing (2.7.8)	36s
multiverse_services_1 (2.4.10)	2m 57s
multiverse (agent, 3.4.1)	3m 36s
infinite_tracing (3.4.1)	10m 11s
multiverse (ai, 2.4.10)	1m 11s
multiverse_services_1 (3.4.1)	3m 47s
multiverse_services_2 (2.4.10)	2m 31s
multiverse (ai, 3.4.1)	1m 25s
multiverse_services_2 (3.4.1)	3m 24s
multiverse (background, 2.4.10)	1m 50s
multiverse_services_kafka (2.4.10)	2m 26s
multiverse (background, 3.4.1)	1m 56s
multiverse_services_kafka (3.4.1)	5m 40s
multiverse_services_mysql_pg (2.4.10)	4m 34s
multiverse (background_2, 2.4.10)	4m 48s
multiverse_services_mysql_pg (3.4.1)	2m 51s
multiverse (background_2, 3.4.1)	6m 0s
multiverse (frameworks, 2.4.10)	1m 51s
multiverse (frameworks, 3.4.1)	3m 49s
multiverse (httpclients, 2.4.10)	2m 17s
multiverse (httpclients, 3.4.1)	2m 44s
multiverse (httpclients_2, 2.4.10)	2m 32s
multiverse (httpclients_2, 3.4.1)	2m 4s
multiverse (rails, 2.4.10)	2m 54s
multiverse (rails, 3.4.1)	5m 58s
multiverse (rest, 2.4.10)	4m 4s
multiverse (rest, 3.4.1)	5m 58s
simplecov	18s
	1h 47m 56s

Provide feedback