[SR-Dev] git:janakj/postgres: Merge commit 'pg/master' into postgres