Merge "Require command and argument separation, cleanup." into jb-mr2-dev