Merge "Revert "use new cmd command""