Merge "Integration w common/postgres"