CLP updates.
Merge branch 'master' into e