Merge "Move more endpoints to singleton scope and remove providers"