[Pmc2c] WIP for Issue #1080