Plfs2.5dev

Merging plfs2.5dev into master.