update PFB merge code for pulsar

Merged Jason Wu requested to merge PFB_merge_update into devel

Merge request reports