Merge "Fixes clone fork change URL" into stable/euphrates