Update for new 6.2 branch and new master branch