Fixing API Gateway remaining tickets and bug fixes #1841

Job	Run time
build	6m 2s
check	5m 1s
docker-targets-build (${{ matrix.platform.platform }})	0s
cli-tests	11m 15s
integration-tests	11m 9s
sharding-tests	9m 42s
unit-tests	8m 29s
worker-tests-group1	4m 9s
worker-tests-group2	18m 41s
worker-tests-group3	4m 37s
worker-tests-group4	4m 6s
worker-tests-group5	11m 39s
docker-publish	0s
publish	0s
	1h 34m 50s

Provide feedback