Merge "baseline services.impl, update services.core.unboosted" into main