Update for CDH5.2.0