Merge "Add -i option to toolbox cmd ls"