Merge "Stop running commands with async"