Merge "Fix 'run singleCommand'"