CLEARWATER: CA-102927: improvements to duplex reporting of PIFs

Duplicate of #1135 for Clearwater