Sync implementation of PersistedImpl with master branch

Refs 4dfabeab1f73c10a1b4dc46567fe70fb6ab04b9d