Fixing API Gateway remaining tickets and bug fixes #1811

Job	Run time
check	4m 37s
integration-tests	10m 35s
build	5m 40s
docker-targets-build (${{ matrix.platform.platform }})	0s
unit-tests	8m 12s
worker-tests-group1	3m 43s
cli-tests	9m 56s
sharding-tests	9m 33s
worker-tests-group2	3m 43s
worker-tests-group3	3m 45s
worker-tests-group4	3m 22s
worker-tests-group5	3m 40s
docker-publish	0s
publish	0s
	1h 6m 46s

Provide feedback