Merge some svcmds stuff.

Check the issues to be closed.