Merge "Fix cleanup CLI for router client"