[PATCH 2/2] moved/merged discussion of some services out of base services into relevant sections