Merge branch 'command-max-lines'