Cloud Platform

Additional changes for Cloud Next readiness