Merge "Add support to configure PostgreSQL as DataSource"