o.c.application.command.server: Code polishing
Merge branch 'command-server'