Use -CommandWithArgs
instead of -cwa
#2404
Merged
-CommandWithArgs
instead of -cwa
#2404