updates to handle PostgreSQL mirror
Merge branch 'dev'