Merge "Add impl of more PDP persistence"