🐛 Refactoring to follow up PR #1573 comments (#1578) #5489

Job	Run time
build-and-upload-for-global-ci	4m 1s
unit-test (18.x)	4m 10s
test-integration / e2e-ui-integration-tests (tier0)	22m 51s
test-integration / e2e-api-integration-tests	0s
	31m 2s

Provide feedback