Merge "Migrate to using config change to update bounds" into sc-dev