[pull] trunk from cli:trunk#231

pull[bot] merged 2 commits into

All-Blockchains:trunkAll-Blockchains/cli:trunkfrom

cli:trunkcli/cli:trunkCopy head branch name to clipboard