Merge branch 'sh/postgresql-writer'