Merge "sysutils: Increase number of command arguments to 16"