Change request #234: update CP