Setting up Branch 1.7.x