Merge "Implement shell commands for package and user services"