Merge the cli_cleanup branch.