Merge "Fix DO provisioning for auto" into sc-dev