*8094* Merge users to PKP lib