merge in servicelauncher just to have it stabilise in sync