Use proper logging function in Persistent
Merge remote-tracking branch 'origin/postgres' into postgres