Merge "Add scaling factor for guided enrollment" into sc-dev