Update gcheckout for testing.
Some changes for testing.
merge conflict