Merge pull request #4302 from t-nelson/rm_cpluff_generated