EX-64(cgates kmeng): Final changes before merge.