Merge remote-tracking branch 'cbrownstein/web/15120-improve-command-line-presentation' into web/15120-improve-command-line-presentation