Merging latest pkp/lib