Merge "Add the rollout control for incremental setup." into main