Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix