Merge pull request #13391 from OpenIoTHub/gateway-go-pr