Update for CM5.1 / CDH5.1