PMO-2231: additional fields added when collecting CCP by default