#771 Replace implicit service intents by explicit ones