Use proper logging function in Persistent
Merge branch 'postgres' into mysql
Fix previous merge