Merging of other branches + fix to plfsrc.5in

Merging of other branches + fix to plfsrc.5in