merge the changes from my ast_cli_tls branch ...