Merge branch 't/cmd_improvements'