Merge branch 'dev': fixed command line processing bug