Changes for PCM 349

@ardasgup @sshumake  Please review and merge.