Modification to build the 7.0 branch.