Merge "Add service configinfrastructure"