Update for CDH5.3.0