edit comment
Merge branch '1867_apache_CLI'