Sync CliGitAPIImpl with master branch