Replace test computing git version with CliGit computing version
Fix compile error from previous commit
Merge commit '9e85ab121a4f00d817ccdbabcaf71aa68ff11809' into HEAD