Merge "Fix the number of arguments for verity commands"