Merge "Revert "Revert "use new cmd command"""