[PATCH 0/2] reworked text in base services