PR #9707 review: cloud environment onboarding