am 954e3e90: Merge "Require command and argument separation, cleanup." into jb-mr2-dev

* commit '954e3e90181533041858f230cc10388f4c90e014':
  Require command and argument separation, cleanup.