Merge latest CC_pdlogs-56