Merge pull request #1380 from apache/dev-postgresql

Merge Dev for V5.1.0