Changes for PCM - 260

Spenser, 

Please review the changes and then merge this. Aritro has reviewed this. The second reviewer is you.

Thanks,
 Renu