12 Commits (servicefixes)