XD-796: Split shell "--all" commands