Service types hotfix f-me/carma#1847