PR #9706 review: environments.machine_size migration