Merge pull request #11184 from daleckystepan/fix-cli-unittest