Merge "Improve 'service' command"