Added initial cloud gateway.
Merge remote-tracking branch 'origin/develop' into develop