Merge LP changes from CM