Merge "Validate commands and arguments." into ics-mr0