MFC r263878:
Several fixes for the PCID implementation.