[pull] trunk from cli:trunk#249

pull[bot] merged 8 commits into

demaford:trunkdemaford/cli:trunkfrom

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